From 6fd8a628cfe4f9249031f8c920d9963ae79db274 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Thu, 29 Jan 2009 11:28:09 +0000 Subject: [PATCH] x86: Although bzimage_headroom() doesn't return -ve values, bzimage_parse() can. Signed-off-by: Keir Fraser --- xen/arch/x86/bzimage.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/bzimage.c b/xen/arch/x86/bzimage.c index f432c9e115..37bc78eec2 100644 --- a/xen/arch/x86/bzimage.c +++ b/xen/arch/x86/bzimage.c @@ -185,7 +185,7 @@ static __init int bzimage_check(struct setup_header *hdr, unsigned long len) if ( hdr->version < VERSION(2,8) ) { printk("Cannot load bzImage v%d.%02d at least v2.08 is required\n", hdr->version >> 8, hdr->version & 0xff); - return 0; + return -EINVAL; } return 1; } @@ -198,7 +198,7 @@ int __init bzimage_headroom(char *image_start, unsigned long image_length) err = bzimage_check(hdr, image_length); if (err < 1) - return err; + return 0; img = image_start + (hdr->setup_sects+1) * 512; img += hdr->payload_offset; -- 2.30.2